Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Jul 2010 22:55:12 +0000 (22:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Jul 2010 22:55:12 +0000 (22:55 +0000)

Trivial merge